Auto merge of #3717 - king6cong:clean, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 16 Feb 2017 20:08:18 +0000 (20:08 +0000)
committerbors <bors@rust-lang.org>
Thu, 16 Feb 2017 20:08:18 +0000 (20:08 +0000)
remove unnecessary code


Trivial merge